18574 - EFT Verification Fixes #1328
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Kudos, SonarCloud Quality Gate passed!
|
ochiu
commented
Nov 27, 2023
| .filter(InvoiceModel.payment_method_code == PaymentMethod.EFT.value, | ||
| InvoiceModel.overdue_date.isnot(None), | ||
| InvoiceModel.overdue_date.cast(Date) <= current_local_time().date(), | ||
| func.date(overdue_datetime) <= current_local_time().date(), |
ochiu
commented
Nov 27, 2023
| auth_account_ids = [pay_account.auth_account_id for _, pay_account in statement_settings | ||
| if pay_account.payment_method == PaymentMethod.EFT.value] | ||
|
|
||
| current_app.logger.info(f'Processing {len(auth_account_ids)} EFT accounts for monthly reminders.') |
There was a problem hiding this comment.
Added some debug, and added some additional filtering for EFT payment method for auth_account_ids
ochiu
commented
Nov 27, 2023
|
|
||
| @classmethod | ||
| def find_most_recent_statement(cls, auth_account_id: str, statement_frequency: str) -> StatementModel: | ||
| """Find all payment and invoices specific to a statement.""" | ||
| query = db.session.query(StatementModel) \ | ||
| .join(PaymentAccountModel, PaymentAccountModel.auth_account_id == auth_account_id) \ | ||
| .join(PaymentAccountModel) \ | ||
| .filter(PaymentAccountModel.auth_account_id == auth_account_id) \ |
There was a problem hiding this comment.
Fixed bad join, missing criteria
ochiu
commented
Nov 27, 2023
| .filter(StatementModel.frequency == statement_frequency) \ | ||
| .order_by(StatementModel.to_date.desc()) | ||
|
|
||
| return query.first() | ||
|
|
||
| @classmethod | ||
| def determine_to_notify_and_is_due(cls): | ||
| def determine_to_notify_and_is_due(cls, invoices: [InvoiceModel]): |
There was a problem hiding this comment.
Refactored to be properly driven by overdue date
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #1328 +/- ##
==========================================
+ Coverage 91.45% 92.02% +0.56%
==========================================
Files 186 160 -26
Lines 11319 10690 -629
==========================================
- Hits 10352 9837 -515
+ Misses 967 853 -114
Flags with carried forward coverage won't be shown. Click here to find out more.
|
ochiu
commented
Nov 27, 2023
| @@ -94,24 +106,24 @@ def publish_statement_notification(pay_account: PaymentAccountModel, statement: | |||
| return True | |||
|
|
|||
|
|
|||
| def publish_payment_notification(pay_account: PaymentAccountModel, statement: StatementModel, | |||
| is_due: bool, due_date: datetime, emails: str) -> bool: | |||
| def publish_payment_notification(info: StatementNotificationInfo) -> bool: | |||
There was a problem hiding this comment.
Converted params to dataclass to make it cleaner
ochiu
commented
Nov 27, 2023
| @@ -72,7 +84,7 @@ def publish_statement_notification(pay_account: PaymentAccountModel, statement: | |||
| 'emailAddresses': emails, | |||
| 'accountId': pay_account.auth_account_id, | |||
| 'fromDate': f'{statement.from_date}', | |||
| 'toDate:': f'{statement.to_date}', | |||
| 'toDate': f'{statement.to_date}', | |||
There was a problem hiding this comment.
Fixed typo in params causing failure on the account mailer
ochiu
commented
Nov 27, 2023
| @@ -60,6 +60,11 @@ def apply_credit(self, invoice: Invoice) -> None: | |||
| self.create_receipt(invoice=invoice_model, payment=payment).save() | |||
| self._release_payment(invoice=invoice) | |||
|
|
|||
| def complete_post_invoice(self, invoice: Invoice, invoice_reference: InvoiceReference) -> None: | |||
There was a problem hiding this comment.
Accidentally reverted this change in a previous PR, adding back in.
This allow payments to be properly released for EFT when invoices are created.
seeker25
approved these changes
Nov 27, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #:
bcgov/entity#18574
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the sbc-pay license (Apache 2.0).